Merge from upstream 20140611

https://travis-ci.org/leftclickben/providence/builds/27290899