Sync'd branch releases/beta with upstream @ Thu Oct 30 13:58:38 PDT 2014