Merge pull request #414 from rackerjoe/master

Merged automatically by jenkins after successful gate test