General cleanup (upgrade to quasar-0.6.2)
Fix merge conflicts.
Merge branch 'puniverse-master'