Merge from trunk
Merge pull request #18 from rackerlabs/auto-366-create-check-pass-2

Auto 366 create check pass 2
Merge from trunk