Fix for overflowing modals
Merge remote-tracking branch 'upstream/master'