Sync'd branch releases/beta with upstream @ Wed Nov  5 14:06:29 PST 2014