Merge braithwaite's last-quarter 2014 development; one fix for character.metadata #76

Closed wltrimbl closed 7 years ago