Merge remote-tracking branch 'origin/master'

# Conflicts:
#	index.md
2 jobs for master in 1 minute and 12 seconds (queued for 1 second)