revised to match common
Merge remote-tracking branch 'upstream/master'
match common
Merge pull request #133 from MartyBurns/master

Sync up common with test versions of sql files