fixes #529
should fix #545 but i cant test it on dev because the map is dumb
fixes #581
Merge remote-tracking branch 'upstream/stable' into stable
testimonial author listing updated
Merge pull request #703 from corinnecurcie/stable

small fixes