Fix compiler errors
Merge remote-tracking branch 'origin/master' into gh-pages
Old shit to new shit