Merge branch 'master' of https://github.com/cbhaley/calibre
Fix the template editor to grab an empty custom column dictionary so that it can validate use of custom column lookup names.