Merge branches 'bigrtm.2012.06.30a', 'doctorture.2012.06.27a', 'fixes.2012.06.27a' and 'fnh.2012.06.30a' into HEAD