Applied code rev changes
refs #630
Merge branch 'master' into tile-scannable
Merge branch 'master' into tile-scannable