Merge commit 'refs/pull/197/head' of github.com:intel/tinycbor