Commit 869320a85db5bf417cbd8d7317b7a6a35af440bc

Edward Thomson 2015-12-26T16:55:29

Merge pull request #3546 from Cruel/master Fix a couple function signatures