Fix handling of short (< 4 character) checksums and a bug with parsing
old-style custom layouts. Based on fix from Chris Johnsen.
Merge branch 'master' into guns

* master:
  Fix handling of short (< 4 character) checksums and a bug with parsing old-style custom layouts. Based on fix from Chris Johnsen.