Merge branch 'master' into 1.3
Merge branch '1.3' of https://github.com/oria/gridx into 1.3