Awn

Comment 19 for bug 160375

Fix from desktop-agnostic merged into trunk by way of awn-core-testing