Updated to reflect on capabilities changes in 2014.08.1
Fix Merge
Merge branch 'maksimov-develop' into develop