2.6

Changes based on email 2014-07-07