Merge remote-tracking branch 'origin/develop'
Cleanup comments.
Merge remote-tracking branch 'origin/master' into develop