Description now adds a a source if available
Merge branch 'master' into feature/mapbox

* master:
  Description now adds a a source if available