Potentially fix issue #565, bbpress warning
Merge branch 'pr/744'

Conflicts:
	readme.txt