Fixing source header
Merge branch 'master' into v1.3