Update master with develop

Have you considered moving away from the jQuery promise implementation and going native w/ polyfill?