Merge commit 'fa53d78' to bring up to date with upstream master-> v0.2.2: overhauled bones system(heroes remains). Fairly tentative, needs to be tested.