Merge branch 'release/1.1.4'
Bump dev revision
Merge pull request #43 from zenoss/master

Master