1.3.6 final commit

git-svn-id: https://plugins.svn.wordpress.org/iwp-client/trunk@976454 b8457f37-d9ea-0310-8a92-e5e31aec5664