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