Sync w/ master (0.7.4)
Merge branch 'gh-pages' of github.com:mesosphere/marathon into gh-pages