Merge branch 'master' into fa-dev which includes the Persian translation
authorTomas Stary <T.Stary@exeter.ac.uk>
Sun, 2 Oct 2016 09:19:58 +0000 (10:19 +0100)
committerTomas Stary <T.Stary@exeter.ac.uk>
Sun, 2 Oct 2016 09:19:58 +0000 (10:19 +0100)

Trivial merge