Merge "Tag "tests" alone doesn\'t prevent including emma.jar" am: a23a97e3bf
am: 7c09c937b6

* commit '7c09c937b6e5e747d31e5ba308e6b3939cfdd83e':
  Tag "tests" alone doesn't prevent including emma.jar