Redmine#1884: Add ^context=xyz specifier to module protocol, with acceptance test
Redmine#2516: add "int", "real", "mac", "ipv4", and "ipv6" options to sort function
Add extra IPv6 sorting tests
Merge pull request #919 from kacfengine/master

Fix linking problem on Windows.
Fix double free in PolicySourceFiles() (Redmine #3319).
LF/LN should be considered as blank outside of quoted CSV fields
Merge pull request #921 from jeffali/csv_parser_lfln

LF/LN should be considered as blank outside of quoted CSV fields
Strip LF/LN from the end of the string in some special cases
Merge pull request #920 from kacfengine/issue-3319

Fix double free in PolicySourceFiles() (Redmine #3319).
Merge pull request #922 from jeffali/csv_parser_lflnfix

Strip LF/LN from the end of the string in some special cases
CSV strings starting with , should give birth to a leading empty field
Merge pull request #923 from jeffali/csv_parser_leadnull

CSV strings starting with , should give birth to a leading empty field
Fix accidental rename in storage syntax body volume_method => body volume
Add more Mustache tests from Ted
Merge pull request #847 from tzz/tzz/redmine-1884-set-module-context

Add ^context=xyz specifier to set the bundle for the module variables
Merge pull request #898 from tzz/tzz/2516-numeric-sort

Redmine#2516 and Redmine#3132: numeric, IPv4, IPv6, and MAC address sort
Fix compile error on sort_test.