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