Change exit code to 0 as it unnecessarily fails on travis while building docs
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages