#FEC-1379 #comment enable companions by default
bump 2.9.rc4
Merge branch '2.9-May-18' into fec-1405
bump 2.9.1