Merge branch 'release/1.2'
Now using two machines: one master, one minion
Documentation fixes
Merge branch 'hotfix/1.3.1' into develop