1.3.3 final commit

git-svn-id: https://plugins.svn.wordpress.org/iwp-client/trunk@955980 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop'