Merge branch 'master' into 4926-browser-based-upload
authorRadhika Chippada <radhika@curoverse.com>
Mon, 19 Jan 2015 19:35:54 +0000 (14:35 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 19 Jan 2015 19:35:54 +0000 (14:35 -0500)

Trivial merge