Merge branch 'hotfix/pythonpath' into develop
Merge branch 'hotfix/pythonpath2' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Added the ability to 'log' a completed task.
Merge branch 'release/1.7'