Merge branch 'upstream' into develop
Update License year/name
Merge pull request #193 from tpkelly/develop

Update License year/name