Merge pull request #1 from jamesra/master

Minor bug fixes
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' into nornir-master
Merge branch 'dev'