Merge commit '6d87669357936bffa1e8fea7a4e7743e76905736' into next.2013.10.22a

Get -next testing on merge of stuff in -tip and urgent fix.