Sync'd branch releases/beta with upstream @ Thu Oct 30 14:39:41 PDT 2014