Sync'd branch releases/beta with upstream @ Thu Nov  6 07:59:51 PST 2014