Merge branch 'release/2014.04.24'
Merge branch 'master' of github.com:thisissoon/Flask-Velox