Merge branch 'master' into perf_updates
authorJustin Sobota <jsobota@ti.com>
Fri, 17 Jul 2015 20:10:22 +0000 (16:10 -0400)
committerJustin Sobota <jsobota@ti.com>
Fri, 17 Jul 2015 20:10:22 +0000 (16:10 -0400)

Trivial merge