Merge branch 'release/1.0.11'
Merge pull request #27 from praekelt/master

Merge branch 'release/1.0.11'