Merge remote-tracking branch 'jzombi/python3.4_tls'