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