Also add bold version
Merged 'develop'.