#20262 Fixes
Merge branch 'i20262'

Conflicts:
	assets/javascripts/issue-history-tabs.js