hunt down strange problem with sync
Merge branch 'development' into vle