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