Updated branch alias
Merge branch '4.0'
Merge branch '4.0'
Merge branch '4.0'
Merge branch '4.0'
Merge branch '4.0'
Merge branch '4.0'
Error screen no longer requires jquery