Add computeOutput functionality for FeatureMaps
Merge remote-tracking branch 'origin/master'