Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' into gh-pages
Shorten github link in header to avoid wrap on Windows
Merge branch 'hotfix-0.3.1' into develop