Merge updates from STJr:master

2.1.12