Merge branch 'master' into feature/stabilization
pl injection on 20140526-142752
pl injection on 20140619-111507
Merge branch 'feature/stabilization'