Fix ABAcalls OOG bug
Merge remote-tracking branch 'upstream/develop' into StateBug
Merge remote-tracking branch 'upstream/develop' into StateBug
Merge remote-tracking branch 'upstream/develop' into StateBug
Clean up state tests
style
Merge pull request #490 from CJentzsch/StateBug

Quick fix for OOG in deep calls