2014 05-06 release changes

Also changes by Sef to do same changes on prod app/worker.