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