Merge pull request #2121 from octo/netapp