restoring a couple of required fixes for datasource
Merge branch 'master' of github.com:alleyinteractive/wordpress-fieldmanager