Merge branch 'master' into 13562-group-properties

diff --cc services/api/db/structure.sql
index f5a5f2a2eec7a59845f1997d6a613bf8f5a820bb,297bf57e0f6693bce7f6ec7ba13ae20b74658ee6..a201a05aaf83a8efe52469f349e4c84fb75927f3
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -3088,5 -3108,5 +3116,6 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20180514135529');
  
 -INSERT INTO schema_migrations (version) VALUES ('20180607175050');
 +INSERT INTO schema_migrations (version) VALUES ('20180608123145');
  
++INSERT INTO schema_migrations (version) VALUES ('20180607175050');