TSR 7
InlineNodes added
Merge branch 'master' into gallery
backing up before merge