Squashed commit of 'develop' and 'master'.