gh-pages -> dev

Merged Drane, Lance requested to merge gh-pages into dev

Merge request reports