Changed recently took over to July 2013
Merge branch 'master' into prod