Merge branch 'experimental' of colleen:debian/jabref into experimental