Misc fixes
Pulling in changes from origin
Merge remote-tracking branch 'origin/master'