Merge after cherry picking double click fix.
Merge branch 'master' of https://github.com/ikeough/Dynamo