use initial attempt for masonry
Merge branch 'master' into heroku-edition

* master:
  use initial attempt for masonry