removed a few NullPointerException's
Merge remote-tracking branch 'origin/master'

Conflicts:
	testdata/examples/phpbb_0.png
	testdata/examples/phpbb_1.png
	testdata/examples/phpbb_2.png
	testdata/examples/phpbb_3.png
	testdata/examples/phpbb_4.png
	testdata/examples/phpbb_5.png
	testdata/examples/phpbb_6.png
Merge remote-tracking branch 'origin/master'