Merge forward 2014.7

Merge forward 2014.7