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