work around for Technicolor-Portico/chef#69
Merge branch 'local_dev' into develop