Fixed stupid loop.
Merge branch 'patch_forward_broadcast' into master_nightly
Nightly build 19