telcon 2014-06-18
resolved merge conflict
telcon 2014-06-18 - Terry and Maria