Merge branch 'gh-pages' into 'dev'

# Conflicts:
#   _config.yml
1 job for dev
in 1 minute and 2 seconds and was queued for 34 minutes and 8 seconds