Revision e2f3d400c4d070a57ee4c00cdb571bcefee0f697

Committed on 16/06/2017 7:53 am by Bertrand Dunogier <bertrand.dunogier@ez.no> [GitHub Diff]

Merge branch 'master' into 2.0