bb9093ed57
Due to premature merging of #262 I think the build may be failing right now. Should merge this ASAP to fix it.