Merge master and multifarious hackery.