Merge branch 'jellybean' into JBMP