Merge branch 'master' into 5383-api-db-current-time
authorRadhika Chippada <radhika@curoverse.com>
Mon, 16 Mar 2015 19:30:29 +0000 (15:30 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 16 Mar 2015 19:30:29 +0000 (15:30 -0400)

Trivial merge