Merged #227 "Small adjustments to allow integration with Gerrit Code Review"