Merge in a bunch of commits from JulioJerez