Merge branch 'quoting-fixes'
Dagfinn Ilmari Mannsåker [Sat, 18 Oct 2014 14:47:48 +0000 (15:47 +0100)]

Trivial merge