Catch-up merge from branch/2014-02-22/splay-tune to pick up code review changes.
Catch-up merge from master.