Merge latest changes from harvesthq/master and the replace-prop branch

This pull request re-syncs the option_adding branch with harvesthq/master and includes the fixes in the replace-prop branch (that should be fixed upstream with https://github.com/harvesthq/chosen/pull/1311).