3.4 dev qa checked 00


3.4 Development Merge Request.

QA'ed by Alice on 7/17/2013