Merge upstream20140821

Merging in latest changes form upstream

Includes fixes for label printing which we require.