Merge recent bugfixes to VAMDC upstream.