Signed-off-by: José Valim <jose.valim@gmail.com>
Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed]