Set preferred install as "dist" out of the box.
Merge remote-tracking branch 'upstream/develop' into develop