Fix merge 1.2.3.1
Fix merge 1.2.3.1

transferdev/Transfercoin,MinuteManReserve/mmr-core,syfares/Transfercoin,transferdev/Transfercoin,transferdev/Transfercoin,MinuteManReserve/mmr-core,transferdev/Transfercoin,aspaas/ion,aspaas/ion,aspaas/ion,syfares/Transfercoin,syfares/Transfercoin,transferdev/Transfercoin,syfares/Transfercoin,syfares/Transfercoin,MinuteManReserve/mmr-core,aspaas/ion,MinuteManReserve/mmr-core,MinuteManReserve/mmr-core,aspaas/ion,syfares/Transfercoin,transferdev/Transfercoin,aspaas/ion