Merged origin master to my fork, fixed conflicts. Pull request will fast forward.