Merge branch 'dev'
Removing a symlink
Sphinx documentation system blog posts work
Merge branch 'master' into dev