Sync'd branch releases/beta with upstream @ Thu Oct  2 10:42:34 PDT 2014