Fix Apiary I-06615
Merge pull request #242 from rackerjoe/I-06615

Merged automatically by jenkins after successful build test