Automatically built.

commit 068fa142bdb190db9c78fb261c942a16f57f5bfe
Merge: 539e99e 544bba8
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Fri Dec 5 14:32:32 2014 -0800

    merge staging -> development