Merge pull request #242 from superfell/master

fix for layout expansion crash on server picker.
Tag v1.4.7
Merge pull request #243 from bhariharan/master

Tag v1.4.7