upstream/0.12+git20140509

Balint Reczey

@rbalint

77619e47 · Imported Upstream version 0.12+git20140509 · Dec 11, 2014

Upstream version 0.12+git20140509