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