upstream pull/14 @wombleton

Formats @import the same as @include.