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