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