Sync'd branch releases/beta with upstream @ Wed Nov  5 13:35:35 PST 2014