Stylus support
Merge branch 'stylus' into demo

* stylus:
  Stylus support