Merge branch 'release/1.1.6'
Merge pull request #50 from zenoss/master

Merge branch 'release/1.1.6'