minkkinen Merge upstream changes
Latest commit adcc585 May 24, 2017