Updating master with submittable

With this pull request, the build ceases to be odd. Master should be fine after this.

@gnarph