Changes for Nutmeg

Maarten de Waardrequested to merge
merge-upstream-nutmeg into totem-theme

Fixes #39 (closed) #42 (closed)

Edited by Maarten de Waard

Merge request reports