Merge "Fixed "last modified" date fudging on null edit"