Commit 025c1f66de6487eb604297f38364410411acaf77

DRC 2016-02-22T10:00:19

Fix v7/v8-compatible build Broken by 3ab68cf563f6edc2608c085f5c8b2d5d5c61157e Fixes #60