Next

Includes:
- https://github.com/inliniac/suricata/pull/748
- https://github.com/inliniac/suricata/pull/734
- https://github.com/inliniac/suricata/pull/738

Prscript:
https://buildbot.suricata-ids.org/builders/inliniac/builds/121
https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/42 (1 fail expected)