Richard van der Hoff 7314bf4682 Merge branch 'develop' into rav/get_devices_api
(pick up PR #938 in the hope of fixing the UTs)
2016-07-20 17:40:00 +01:00
..
2016-06-29 15:24:50 +01:00
2016-07-20 16:42:32 +01:00