Merge pull request #485 from rackerlabs/master

Merging dev -> master via PR