3.8.6 - some csv and comment fixes

git-svn-id: https://plugins.svn.wordpress.org/amr-users/trunk@952573 b8457f37-d9ea-0310-8a92-e5e31aec5664