[FIX] FTBFS with Java 8: reference to Base64 is ambiguous
Merge pull request #971 from holu/master

[FIX] FTBFS with Java 8: reference to Base64 is ambiguous