Commit daa8fa84 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'array-context-merge' into 'array-context' 

Merge !74 into !71

See merge request !75
parents 69f298db df4ec218