merge with master

Change-Id: I8e8dda236641acfb11608cf0002e9a2932b0e86e
Reviewed-on: http://review.couchbase.org/43801
Reviewed-by: Yu Sui <ysui68@gmail.com>
Tested-by: Yu Sui <ysui68@gmail.com>