Commit 8e0aa2ebcee4387401ddede323fc4f8751a1ccfd

Linquize 2014-12-07T23:41:30

Fix broken merge tests due to autocrlf was not false