Merge change 287 into donut

* changes:
  Get Sketch compiling.