Sync'd branch releases/beta with upstream @ Thu Oct 30 17:19:40 PDT 2014