Merging...
Merge branch 'bryanro-master'

Manual pull of Bryan RosenBOMBs feed updates.