Sync'd branch releases/beta with upstream @ Thu Nov  6 07:28:40 PST 2014