Merge branch 'master' into 4926-browser-based-upload
authorRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 18:38:45 +0000 (13:38 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 18:38:45 +0000 (13:38 -0500)

Trivial merge