Merge pull request #256 from dejan-brkic/2.4.x

CRAFTERVMS-871