Merge remote-tracking branch 'origin/master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 14 Jun 2015 14:07:33 +0000 (10:07 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 14 Jun 2015 14:07:33 +0000 (10:07 -0400)

Trivial merge