Update to conform 0.7.5
Version 0.11.3
Merge changes from master