Reverted reverse-shadow hack
Merge branch 'master' into gh-pages