Merge branch 'master' into tooltip

Author: donnieberg

components/SLDSTooltip/index.jsx

@@ -104,6 +104,13 @@ module.exports = React.createClass( {
     return 'middle';
   },
 
+  handleCancel() {
+    this.setState({
+      isOpen: false,
+      isClosing: false
+    });
+  },
+
   getTooltip() {
     const style = {
       'slds-popover': true,