Merged master into examples/I-F_curve_LIF