Merge pull request #1 from bkargoll/master

Prepare Production_2013_Dec_12
Merge remote-tracking branch 'upstream/master'