Automatically built.

commit d7d0bd8af62f6cb8ad6c233ff13450fac3ce5242
Merge: 813cdb9 305452b
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Oct 22 13:26:19 2014 -0700

    Merge pull request #234 from code-dot-org/blockWork2

    special functional block rendering

commit 305452b9daba26517717cd8f15a1cf87afcec3b7
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Oct 22 13:25:42 2014 -0700

    test fix and code review feedback

commit 813cdb92959a8ca203268a7aba3055906e53d619
Merge: 53e0706 2ba40e8
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Oct 22 12:35:16 2014 -0700

    Merge branch 'test' into staging

    mmit.