Sync'd branch releases/beta with upstream @ Thu Oct 23 10:55:42 PDT 2014