Merge in the commits from the responsive-2.2 branch

[tijptjik]

Merge commits from here

[tijptjik]

@szs, you should be able to make responsive designs after this issue is done.