Merged current changes from trunk into this fork.