Merging Zuluru commit 1328 (bf51ee4)