3 Commits (acfeacedfc46e04ce7873d7e7c5fc674496d2349)

Author	SHA1	Message	Date
Paul Hollinsky	399c72e61d	Resolve merge conflicts master into devicesettings	2018-09-26 18:24:59 -04:00
Paul Hollinsky	8060b07eee	Fix macOS compile errors	2018-09-26 18:16:05 -04:00
Paul Hollinsky	72773d9afa	Refactor MessageFilter and MessageCallback	2018-09-25 17:53:02 -04:00