Fix merge of commit.
Fix merge of commit.

fsb4000/huntercoin,fsb4000/huntercoin,fsb4000/huntercoin,fsb4000/huntercoin,domob1812/huntercoin,wiggi/huntercoin,domob1812/huntercoin,chronokings/huntercoin,wiggi/huntercoin,chronokings/huntercoin,wiggi/huntercoin,domob1812/huntercoin,chronokings/huntercoin,domob1812/huntercoin,chronokings/huntercoin,wiggi/huntercoin