Merging stroke customization branch with master