Merge branch 'master' into gh-pages
Different labels for fields and panels.
Merge branch 'gh-pages'