Merge branch 'release/2.1.11' into develop
Prepare migration to Django 1.4.5
Respect resource name.
Update adrest
Merge branch 'release/2.1.12'