Sync'd branch releases/beta with upstream @ Thu Sep 18 08:38:41 PDT 2014