KeepLayout 1.2.1
Merge pull request #4802 from iMartinKiss/master

KeepLayout 1.2.1