Summary of changes: 8d444fe... don't patch and ship OC's sample config, write a stub inste (*) a6c30e1... Merge commit '8d444fe0b28aa6e1be1932367110b72aa0f4e8c6' int (*) This commit already existed in another branch; no separate mail sent