Merge branch 'master' into dev
Link mods for sphinx blog post
Merge branch 'dev'