Merge tag 'v2.9.17' into develop

Fixed permissions issues with login contacts.

Conflicts:
	readme.txt

diff --cc readme.txt
index 5a8e26a,a3c9a43..2a92f38
--- 1/readme.txt
--- 2/readme.txt
+++ b/readme.txt
@@@ -67,7 -67,8 +67,6 @@@ There is of course much more to this
  
  == Changelog ==
  
- = 2.9.15 =
- 
- * Added support for shortcode caching. 
+ = 2.9.17 =
  
 -
 -
+ * Fixed login contact permission issues where there were difficulties reading the current contact role.