Merge branch 'release/1.16' into develop
* Fixed bug where Wordpress media library uploads would not functions with plugin active.
Merge branch 'release/1.17'