Sync'd branch releases/beta with upstream @ Thu Oct  2 13:35:35 PDT 2014