Merge commit 'torture.2015.02.23a' into core/rcu