Updating on 11 11 2014

Pulled from upstream