Merge master->java-blackbird

CC: @vaterlaus @yotamhc @ronaldchl

This brings the java-blackbird branch up-to-date with the current master version of Loxigen.