Merge remote-tracking branch 'origin/master'

yujian

2019-05-30 ebce479a2d0634c90e5f80045e204248336b410d

1
Unexpected error.  File contents could not be restored from local history during undo/redo.