Sync'd branch releases/beta with upstream @ Thu Oct 16 18:43:38 PDT 2014