Merge in xyzz's changes

psi29a requested to merge xyzz:master into master Nov 14, 2018