Sync'd branch releases/beta with upstream @ Thu Nov 13 09:43:00 PST 2014