Sync'd branch releases/beta with upstream @ Thu Nov 13 07:06:52 PST 2014