Module: Bean Pane
Merge branch 'james'
Merge branch 'master' into test