Sync'd branch releases/beta with upstream @ Thu Sep 11 19:03:19 PDT 2014