Merge remote-tracking branch 'hugoduncan/fix-classifier-jars'
Merge remote-tracking branch 'upstream/master'