ready for release 3.1.2
Merge remote-tracking branch 'upstream/master' into suggest-v3.x
pointer to CSV import support
Merge branch 'suggest-v3.x' into debian-v3.x
log changes