V2.1-dev_6

Signed-off-by: Jim Lieb <jlieb@panasas.com>