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