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