Merging Zuluru commit 1327 (461435a)