updated branch alias
added method for better BC with AsseticBundle
Merge branch '1.1.x'
Merge branch '1.1.x'
Add a test for non-intuitive behaviour