vi injection on 20140714-005633
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/stabilization
Merge commit 'a5d2bf5c704e1485cf83448e51e544a9df350678' into HEAD