Merge "Python 3 Fix: use six.reraise"