Sync'd branch releases/beta with upstream @ Thu Oct 30 12:55:35 PDT 2014