Rc/2014 04 14

@chrisndodge @jzoldak 
This is https://github.com/edx/edx-platform/commits/rc/2014-04-09 + https://github.com/edx/edx-platform/commit/f04cd649e4c969155e67411292a39a05c590f2f9