Production 2014 jan 21

Please merge the production branch into master, to bring master up to date