Committing 20130827 code from production server