Merge branch 'master' into 39-routes-2
Cleaning up - removing comments, etc