Bug 841269 - fix layering/lazy loading
Merge pull request #250 from asutherland/fix-as-layers

Bug 841269 - fix layering/lazy loading. r=jrburke