Commented out test of not-yet-implemented functionality.
Merge remote-tracking branch 'origin/master'