MBQ: Syntax error
Merge branch 'jellybean' into jellybean-hybrid