Updated to new upstream release (v1.3.16)