Merge branch 'torture.2014.10.28d' into HEAD

torture.2014.10.28d: Torture-test changes