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