v1.2.4
7a4f115c · Merge remote-tracking branch 'origin/develop' · Feb 11, 2015