Cherry-pick of "Merge branch 'AnalysisBaseDevelopments-1.0-20170602' into '1.0'" into master
AnalysisBase Developments, 1.0 branch (2017.06.07.)
See merge request !66 (merged)
AnalysisBase Developments, 1.0 branch (2017.06.07.)
See merge request !66 (merged)