Update zylowalsh with upstream - 12:10pm 30 Aug 2013