Merge commits bc67d96 - 2fa3dd6 from OvercastNetwork:master