support old format label syntax for #4
Merge branch 'master' into gh-pages
'deploy'