Merge v0.12.1 Version Bump into master 

Version bumpage