Fix quote ressurection.
Merge branch 'dev' into css