Quick commit to avoid merge conflicts.

Working on fixing reviews.
Merge pull request #534 from Jedwondle/v1.2

Quick commit to avoid merge conflicts.