Merge branch 'release/1.2.6' into develop
Allow setting of default timeout
Version bump to v1.2.7
Merge branch 'release/1.2.7'