Fix master breakage.
Merge pull request #1618 from AndrejMitrovic/FixMasterBreak

Fix master breakage.