Fixed requirements broken by c81e48386a9386d0d03ccafea424bb0e35f022bb
Merge branch 'master' into FLI
Upstream master updated, pulled to local master. Hence mods merged into branch.