Adds license comment to test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merges linux into master
Explicitly builds with source 1.5 rather than relying on defaults