Updated license information (not sure how this escaped me before)
Merge branch 'master' into 3.2.0