Merge branches 'bigrt.2012.05.21a', 'fixes.2012.05.21a', 'doctorture.2012.05.21a' and 'fnh.2012.05.21a' into HEAD