Sync'd branch releases/beta with upstream @ Thu Oct 23 11:57:40 PDT 2014