Merge remote-tracking branch 'origin/master' into mikhail.golubev/json-preview