Sync'd branch releases/beta with upstream @ Thu Sep 18 17:23:35 PDT 2014