[ReleasePrep][2018.08.20]FI of master into dev#6331

Merged

chenriksson merged 3 commits intodevfrom chenriks-fi-conflicts

Aug 20, 2018

Commits on Aug 8, 2018

Merge branch 'dev' into master (#6266 )
joelverhagen
committed

Commits on Aug 9, 2018

Revert email retry (#6290 )
zivkan
authored

Commits on Aug 20, 2018

Merge branch 'master' into chenriks-fi-conflicts
chenriksson
committed