Sync'd branch releases/beta with upstream @ Thu Oct 16 19:31:33 PDT 2014