1.3.1 final commit

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

Conflicts:
	init.php

Resolved using theirs finally, since they've finally disabled tracking hit count on every load