Latest commit adcc585 May 24, 2017 minkkinen Merge upstream changes