Merge "Work toward Python 3.4 support and testing"