Merge commits f66b8c1 - 840b8c8 from OvercastNetwork:master