GSOC2019 funnelferry

Branch: funnelferry/mss:GSOC2019-funnelferry
Branch: wxmetvis/mss:GSOC2019-funnelferry
Merged
Merged pull request
Merged in funnelferry/mss/GSOC2019-funnelferry (pull request #653)
Merged in funnelferry/mss/GSOC2019-funnelferry (pull request #653)