YAJL last
Pull CC in correct order
Merge branch 'master' into production