Next release from master will 3.0.0
Merge pull request #1167 from jmaas/master

Next release from master will 3.0.0