Merge branch 'release/140606'
Merge tag '140606' into 000000-dev

Tagging 140606