Merge branch 'master' into 3889-functional-testing
authorradhika <radhika@curoverse.com>
Thu, 25 Sep 2014 18:25:50 +0000 (14:25 -0400)
committerradhika <radhika@curoverse.com>
Thu, 25 Sep 2014 18:25:50 +0000 (14:25 -0400)

Trivial merge