Cilantro 2.2.36

Signed-off-by: Byron Ruth <b@devel.io>
Merge pull request #1603 from cbmi/cilantro-2.2.36

Cilantro 2.2.36
Merge branch 'master', remote branch 'upstream/master'