Edited pop-up text.
Merge branch 'master' into development