Adding remark about collision bug in engine.
Merge branch 'master' into MapMacros