Merge branch 'master' into 3138-wiselinks
authorradhika <radhika@curoverse.com>
Fri, 25 Jul 2014 21:56:51 +0000 (17:56 -0400)
committerradhika <radhika@curoverse.com>
Fri, 25 Jul 2014 21:56:51 +0000 (17:56 -0400)

Trivial merge