update
Merge branch '20140630' of https://github.com/guycole/mellow-elephant-py into 20140630