Merged develop, changelog updated