Fixed a bug that was causing a NPE to be thrown when bug links were turned off.
Merge branch 'master' into devel