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