Pulling commit 9821c79

Full commit hash: 9821c79644fd89da3718b54b6debf6c49760c8d9

Editor: added deserialization conversions
Signed-off-by: Ivan Mogilko <ikm_spb@yahoo.com>
-----------------------------------------------------------
NOTE: Cherry-picking this commit was impossible due to too many
revisions to commit parent.