Legend: Also calc the bbox of the legend when the frame is not drawn. This fixes gh1586
Merge pull request #1617 from jenshnielsen/legend_bbox

Legend: Also calc the bbox of the legend when the frame is not drawn. (1.2.x)
Merge pull request #1611 from segasai/master

change handling of legend labels which are None
Merge pull request #1585 from tonysyu/qt-resize

Fix Qt canvas resize_event
Merge pull request #1498 from tecki/qtcloseevent

use QMainWindow.closeEvent for close events
Nuke Travis python 3.1 testing

Python 3.1 is unsuported by Travis-ci [1], so this change removes it.

[1]: http://about.travis-ci.org/docs/user/ci-environment/#Python-VM-images
Merge pull request #1672 from dmcdougall/nuke_travis_py31

Nuke Travis python 3.1 testing
Merge branch 'v1.2.x'