Merge branch 'master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 26 Sep 2015 15:41:17 +0000 (11:41 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 26 Sep 2015 15:41:17 +0000 (11:41 -0400)

Trivial merge