Prevent error when theme does not support featured images
Merge branch 'pr/644' into release/1.5

Conflicts:
	admin/class-metabox.php
	readme.txt