Also small fixes, some spelling, some important; synchronize with upstream a bit.. Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached