Sync'd branch releases/release with upstream @ Tue Sep 23 17:32:28 PDT 2014