Sprout from newnew 2018-08-07 13:55:34 UTC Matthew Webster <mwebster@fmrib.ox.ac.uk> 'rewritten ols to avoid injection'
Cherrypick from master 2013-05-09 12:06:52 UTC Christian Beckmann <c.beckmann@donders.ru.nl> 'ready for 5_0_4':
    test.cc
Cherrypick from master 2016-11-10 15:52:29 UTC Matthew Webster <mwebster@fmrib.ox.ac.uk> '3.15 for 510':
    melodic.h
Cherrypick from ciftiBranch 2015-04-20 11:46:26 UTC Matthew Webster <mwebster@fmrib.ox.ac.uk> 'Conditional iconv':
    Makefile
    melodic.cc
Cherrypick from fsl-5_branch 2018-07-03 15:49:20 UTC Matthew Webster <mwebster@fmrib.ox.ac.uk> 'clarified text':
    meldata.h
    meloptions.h