Merge remote-tracking branch 'origin/power8' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 5 Mar 2016 11:03:19 +0000 (06:03 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 5 Mar 2016 11:03:19 +0000 (06:03 -0500)
Refs #774


Trivial merge