am 6b747cfb: (-s ours) am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread

Merge commit '6b747cfb21e270598c0d1bf1923c4da768a676a8'

* commit '6b747cfb21e270598c0d1bf1923c4da768a676a8':
  Warn when new modules are found that use user tags - DO NOT MERGE