Merge remote-tracking branch 'origin/master' into ndev
Step 7: regression done
Merge pull request #3 from blackdoor/ndev

Step 7: regression done