Reintegrate develop with master - now with more comments.