Merge branch 'master' after 'next' ff merge.

There was one minor change on master branch not included on next that
was handled a different way on next branch.
This commit is contained in:
Bradley M. Kuhn 2014-11-09 17:52:55 -05:00
commit 19df46c78b

Diff content is not available