Merging branch/2014-02-22/splay-tune into master.