Sync'd branch releases/beta with upstream @ Wed Nov  5 09:26:33 PST 2014