Robert Tech^2 Commit

Note to others: For trivial updates and/or other feature updates, desert
the master. Commit otherwise.