Update to Serrano 2.1.2

This fixes CORS support
Merge branch 'master' into demo