Production code as of 4/25/2014

Latest production code copy.