Closes marchaos/master#2