fix-maker-tags-round-9
Merge branch 'develop' of https://github.com/Make-Magazine/makerfaire into develop

Re-Syncing Origin
fix-maker-tags-round-10
Merge branch 'maker-tags-fix' into develop

Minor fix to deal with merge conflict