upstream/1.12.11+git20160301

Balint Reczey

@rbalint

04951d9f · Imported Upstream version 1.12.11+git20160301 · Mar 03, 2016

Unverified

Upstream version 1.12.11+git20160301