Significance: patch
Type: dev

Merging trunk into local