Merged from OpsCode through May 31, 2013 commits.