Initial commit. Based on pull from 2014-11-04