Merge pull requests from MarginallyClever/master