Pull from #based overlords 2014-08-28