Combined pull of both  #1131 and #1132

In case you like them both and want an easy way to pull 'em both in.