Oct 28, 2013 Merge