Resolve conflicts
Merge branch 'appelgriebsch-python34'