0.1.5 merge.

don't merge yet, just comparison PR