Custom build v. 5.7.3

Version based on 5.7.1 including on top of that a few bug fixes and e…

…nhancements (which might or might not be included in 6.0.0) added by Briac and Thomas