Merge branch 'release/2014.05.06'
Merge branch 'release/2014.05.08'
Merge branch 'release/2014.05.19'
Fixes to setup.py / Manifest
Merge branch 'master' into develop