fix for property drawing. fixes 129
Merge remote-tracking branch 'origin/master'