#495: add new rule and test
#495: update from master
Merge pull request #496 from mimmi20/issue-495

Fixes #495
Update BUILD_NUMBER
#492: update from master