Fix for #3544
Merge pull request #3545 from yakky/feature/modaljs

Fix for #3544