Merged code for Jul 22, 2013

Merged code for Jul 22, 2013