daniellockyer committed May 12, 2017