refs #4926 Merge branch '4926-getting-started'
authorNancy Ouyang <nancy.ouyang@gmail.com>
Fri, 23 Jan 2015 19:15:35 +0000 (14:15 -0500)
committerNancy Ouyang <nancy.ouyang@gmail.com>
Fri, 23 Jan 2015 19:17:50 +0000 (14:17 -0500)

Trivial merge