merge from scrutinizer-ci pullreq