Merge branch 'master' into 5383-api-db-current-time
authorRadhika Chippada <radhika@curoverse.com>
Tue, 17 Mar 2015 14:53:47 +0000 (10:53 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 17 Mar 2015 14:53:47 +0000 (10:53 -0400)

Trivial merge