A lot of big and small fixes and enhancements by Andres Valloud, Ken Dickey and Juan Vuletich
1880 merge