DESCRIPTION

Merge master

Change-Id: I94d602bc9d8bbc8be2a2ffb8769baf8011be0608
Reviewed-on: http://review.couchbase.org/69760
Reviewed-by: Titus Ho <Titus xxx@xxx.xxx
Tested-by: Titus Ho <Titus xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2016-11-10 19:51:10.542000000

Change has been successfully cherry-picked as f7fbdb573bdcecd908a1a6fc92a1c4057ea686ad by Titus Ho

-------------------------------------
author: Titus Ho
date: 2016-11-10 19:52:48.830000000

Patch Set 2: Reverted

This patchset was reverted in change: Iacb01d4704c25f95f7b561eb45c91051b9a2b4d2

-------------------------------------
