Sync'd branch releases/beta with upstream @ Thu Oct  2 06:28:39 PDT 2014