Upstream changes: 0.46 Fri Jul 8 17:14:32 UTC 2016 - Apply PR#14 @dagolden++ - Adds CLONE method for thread safety