Merge branch 'master' into feature/keyframe-copy-aste

src/Artemis.Core/Models/Profile/DataBindings/Modes/Conditional/DataBindingCondition.cs

@@ -105,7 +105,7 @@ namespace Artemis.Core
             if (disposing)
             {
                 _disposed = true;
-                ConditionalDataBinding.Dispose();
+                Condition.Dispose();
             }
         }