Media changed in testCss() from 'text/css' to 'text/css;charset=UTF-8'
Import cleanup
Turn private fields/methods into protected fields/methods
Merge remote-tracking branch 'upstream/master'