Merge branch 'master' into 2.x
Merge branch '2.x' of repository:/srv/git/cluster-backbone-sql into 2.x