Fixed a bug that was causing the command to fail when using anything but the "--all" option.
Merge branch 'master' into devel