upstream/2.3.0_20160502

542ca87f · changes due to crlf/lf on linux · May 02, 2016

Sloppy snapshot of upstream + 1 commit due to endings dance with git