Fix fail due to merge commit

This commit is contained in:
Dylan K. Taylor
2016-11-26 16:14:29 +00:00
parent 363431dac2
commit 5f5f71cfbe