Automatic merge of 'ocf' (3b47e7d) into 'master'
Automatic merge of 'ocf' (3b47e7d) into 'master'

ict-felix/stack,ict-felix/stack,dana-i2cat/felix,ict-felix/stack,dana-i2cat/felix,dana-i2cat/felix,ict-felix/stack,dana-i2cat/felix,ict-felix/stack,dana-i2cat/felix,dana-i2cat/felix,ict-felix/stack