Merge in fixes from trunk
3 files changed