CatchUp 2/4/14

Catch up changes on upstream repo