Added necessary Layout definition.
Merge branch 'master' into addpoppler