Merge tag 'v20140515' into develop

v20140515
remove gevent from worker
Merge branch 'release/v20140526'