Revert "Revert "Merge branch '1.0.x' of github.com:treshugart/Model""

This reverts commit f030ca5f6b2807aaf5652b19f0818fff4047c987.