Update from master 10/16/2014