Fix build-all-dev target
Merge pull request #1575 from joshmoore/rebased/develop/build-all-dev

Fix build-all-dev target (rebased onto develop)