Merge upstream20140821

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