Next

Includes:
- https://github.com/inliniac/suricata/pull/755
- https://github.com/jasonish/suricata/commit/f1bb9dcf19cf2a7501f6e73004706003b2096512 from https://github.com/inliniac/suricata/pull/691

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/123
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/44