Merge pull request #1394 from jp-bennett/master