Merge pull request #294 from eputnam/release_prep
authorBryan Jen <bryan.jen@gmail.com>
Fri, 2 Sep 2016 18:56:56 +0000 (11:56 -0700)
committerGitHub <noreply@github.com>
Fri, 2 Sep 2016 18:56:56 +0000 (11:56 -0700)
(FM-5556) release prep for 1.4.0


Trivial merge