Merge branch 'develop'
Revised composer.json
Updated composer.lock.
Updated wputils dependency to 1.*
Resolved merge conflicts.
Merge branch 'master' into develop