Merge tag '1.6.1' into develop

1.6.1
1.7.0-dev.42 version of git-flow-avh
Merge branch 'release/1.7.0-dev.42'