Merge trunk into branch "tagged-pointers"