All changes to get to Niklaus 2.1.7.1.rc4 as of 20130523