• Merge branch 'master' into tests/switch_to_random_value_other_than_fo… 

    …r_sort
    Isabel Drost-Fromm
    Isabel Drost-Fromm committed May 2, 2016
    cf1d0d5