4.0.2.1 updates
4.5 merge #3
4.5 merge #4
4.5 merge #4: autoconf