Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #554 from serathius/image-0.3
Cherry pick #553 to release-0.3
Cherry pick #553 to release-0.3