Merge branch 'master' into aeschli/cssheadless