Fix lp:1399229
Merge pull request #1272 from perrito666/fix_1399229

Fix lp:1399229



(Review request: http://reviews.vapour.ws/r/586/)
Merge branch 'master' into backup-replicaset