Fix Sun rendering in IE11

This includes the changes from #1732 so merge that one first.
CC #1616