Merged matthewkotila/adium/tip into default
default
2016-09-05, Robbie