Merge all fixes from trunk in preparation for a v1.5.1 release.
7 files changed