Merged masters

Merged incremental changes from “Deployments from DEV to SIT/BETA for
2013-12-02” into master files.