replace sources tag w/ an include
Merge remote-tracking branch 'origin/master'