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