Sync'd branch releases/release with upstream @ Tue Sep 23 11:40:38 PDT 2014