Provisions for MATLAB 8.4 (R2014b)
(cherry picked from commit f4f7a02fd7ca13d58e947f637769c5f991fe03b1)