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