Changes for Nutmeg

Merged Maarten de Waard requested to merge merge-upstream-nutmeg into totem-theme
Edited by Maarten de Waard

Merge request reports