Restored FTP option
Conflicts resolution should be ok now
Remove Spaces at EOL, fixed if test on pattern variable
Fixed call to String.match with regexp pattern
Added missing space in comment
Renamed PATTERN_FILTER -> FILTER
Renamed FILTER -> DUMPFILTER, more intuitive and coherent
Cleaned up Array.join call
fixed conflict while merging from heartbleed branch