FIX: Infinite Loop with beginEdit()
FIX: Missing beginEdit()
Merge remote-tracking branch 'origin/chris' into alex