Fix build
Merge branch 'jellybean' into JBMP