Merging in Zuluru commit through 1346 (311ec0e9e7)