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