Merge pull request #1730 from damao/develop

Fix / Disallowed Key Characters.