[Autotest] Master synced with next as of 08-10-2012

Hi folks,

I've merged master with next about half an hour ago. I did my best in
catching up bugs that were lurking around on next patches (there were
*many*). I hope I could catch most of the bad stuff, but if something
have slipped, please forgive me, I'm working on mechanisms to be better
at doing this work.

Lucas