fixed PY-12476 Django: Nose Test Runner: not able to run django tests with django 1.6: AttributeError: 'NoOptions' object has no attribute 'with_fixture_bundling'
Fog patch 2
(cherry picked from commit 1ed4a92)
IDEA-122950 Breakpoints aren't set, unless debugger already active
Fog patch 3
(cherry picked from commit 3487b86)
Fog patch 4
(cherry picked from commit 48d6308)
Merge remote-tracking branch 'origin/master'
Xcode keymap tweaks +review CR-OC-1412
PY-12579 "url" function is not processed correctly when imported as alias
Merge remote-tracking branch 'origin/master'
IDEA-123141 Refactor / Rename erroneously wraps xml element content in CDATA when it already exists, and corrupts text content if two occurrences