Fix custom option defaults not merging correctly
Merge remote-tracking branch 'artnez/master'