Catch up to 0.15.0pre