Sync'd branch releases/beta with upstream @ Thu Nov  6 17:02:50 PST 2014