Comment 38 for bug 1251590

@Nova core: another round of review/test on the master and havana patches would be awesome.