upstream/1.2.4

Andriy Grytsenko

@LStranger

094990f6 · Adding upstream version 1.2.4. · Feb 21, 2016

Tagging upstream version 1.2.4.