Merge branches 'bigrt.2012.07.23a' and 'fixes.2012.07.23a' into HEAD