Merge remote-tracking branch 'origin/master'
Catch up on html comments. Added type to settings object.