BF-195 modified non-terminating map reduce function to sleep instead of spinning
Merge remote-tracking branch 'upstream/master'