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

Sprout from master 2014-06-18 14:55:52 UTC Matthew Webster <mwebster@fmrib.ox.ac.uk> 'potential fix for weird child process bug on some accounts'
Cherrypick from master 2013-07-05 13:32:37 UTC Christian Beckmann <c.beckmann@donders.ru.nl> 'fixed f..... up calc_corr in econ mode':
    Makefile
Cherrypick from fsl-5_branch 2014-03-25 16:21:51 UTC Paul McCarthy <paulmc@fmrib.ox.ac.uk> 'Melodic exits early if specified time series/session design matrices do not match the data dimensions/number of input files.':
    meldata.cc
    meloptions.cc
Delete:
    doc/anim_gui.gif
    doc/concat_diag.png
    doc/gui.png
    doc/index.html
    doc/mel1.png
    doc/mel2.png
    doc/mel3.png
    doc/pica_diag.png
    doc/tica_diag.png
    dual_regression
    fsl_dualreg.cc
    melgmix.cc
    melgmix.h
    melhlprfns.cc
    melhlprfns.h
    melica.cc
    melica.h
    melodic.h
    meloptions.h
    melpca.cc
    melpca.h
    melreport.cc