Merge master to release 0.12.0