Rc/2013 07 11

Pull request for the release on Jul 11, 2013.