Sync'd branch releases/beta with upstream @ Thu Nov  6 11:03:54 PST 2014