Merge pull request #3489
2a72015 qt: Remove unused method OptionsModel::getTransactionFee (Wladimir J. van der Laan)