Merge branch '3.x' of https://github.com/codership/galera into 3.x