Bug 1038390 - Make Your Own Make-Masonry
 Bug 1059425 - "Make Your Own" makes should use new make directive
Merge pull request #953 from gesa/1038390/masonry

Fixes Bug 1038390 - Make Your Own Make-Masonry & Fixes Bug 1059425 - "Make Your Own" makes should use new make directive