Refs #92: fix for 2.x
Merge branch '2.x' of github.com:codership/galera into 2.x
Merge galera-2.x upto revno 318911d45ac278c6d5f1bae6661f8f75c812d68b