Release 4.7.1 - Sorry for the bad merge guys