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