po request fixes
Merge remote-tracking branch 'upstream/master' into SessionKeepLiveWhileInEditMode
Merge pull request #195 from innaDa/SessionKeepLiveWhileInEditMode

Session keep live while in edit mode
Merge remote-tracking branch 'upstream/master'