Merge branch 'master' into 2012-12_December_Update
Merge branch 'master' into 2012-12_December_Update