Merge branch 'master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 20 Dec 2015 20:06:32 +0000 (15:06 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 20 Dec 2015 20:06:32 +0000 (15:06 -0500)

Trivial merge