merge of gmp plugin branch to master for mac and windows