Sync'd branch releases/beta with upstream @ Thu Oct  2 07:02:31 PDT 2014