Travis CI auto-merge of master from build 818
Travis CI auto-merge of master from build 818

DeepElement/winjs-rocks,DeepElement/winjsrocks,DeepElement/winjsrocks,DeepElement/winjs-rocks,DeepElement/winjsrocks,DeepElement/winjs-rocks