Caught up 2013.07 with 2013.02 bugfixes

Caught up 2013.07 with 2013.02 bugfixes