upstream/2.40+git20140216

Balint Reczey

@rbalint

91eed258 · Imported Upstream version 2.40+git20140216 · Oct 25, 2014

Upstream version 2.40+git20140216