Merging b_2012_533 to HEAD before git migration.
Merge branch 'master' into b_run2012_533