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