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