Merge branch 'production' into DEV20140925
Merge branch 'production'