Path fix for github host
Merge remote-tracking branch 'origin/development' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'