Merge from mitsuhiko