Fixes #1632
Merge branch 'issue1632' into dev-master
Build files for axis-category-base.
Merge remote-tracking branch 'upstream/dev-master' into dev-master
Merge branch 'dev-master' into dev-3.x