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