Merged master branch into distance

Merged master branch into distance, shouldn't make a difference, but
probably should do this. If not roll back.