Merging dev-master 0.3.0 changes.