Merged changes from 0.8-maintenance branch
Updated license header