Merge branch 'master' into topics/trial_comparison
commit846a801bc708e14c2ff7dbc0f2c2a3b4d2cec593
authordauglyon <dauglyon@users.noreply.github.com>
Mon, 10 Jul 2017 21:33:13 +0000 (10 21:33 +0000)
committerdauglyon <dauglyon@users.noreply.github.com>
Mon, 10 Jul 2017 21:33:13 +0000 (10 21:33 +0000)
tree7c5bb9212ee73a916fc69c990a3fa02196b6b9e5
parentc294bc4fd61d275b1cde80ed9b013a7138f0e418
parent717b2152e5e9fd07d8819d6e5e424ce9834a8533
Merge branch 'master' into topics/trial_comparison