Merge pull request #245 from Yoast/trunk

Merging trunk into master