Fix definition decorators (closes #393)
Merge tag 'v2.0.3-PL1' into 2.1.x
Merge tag 'v2.1.3-PL1'